Merge remote-tracking branch 'remotes/bmx6-owrt/master' into openwrt-bmx6
authorp4u <[email protected]>
Wed, 24 Apr 2013 14:56:59 +0000 (16:56 +0200)
committerp4u <[email protected]>
Wed, 24 Apr 2013 14:56:59 +0000 (16:56 +0200)

Trivial merge